From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 4 Mar 2009 13:36:34 +0000 (+0000)
Subject: (w32_wnd_proc): Only ignore IME messages for the
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1420
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=55987edfc48a820911e2c7dfb3cb476c9054ee34;p=emacs.git

(w32_wnd_proc): Only ignore IME messages for the
characters that have already been read.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 16649cce2cb..97b9adea2ce 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3159,10 +3159,13 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
               my_post_msg (&wmsg, hwnd, WM_UNICHAR, (WPARAM) buffer[i],
                            lParam);
             }
-          /* We output the whole string above, so ignore following ones
-             until we are notified of the end of composition.  */
-          ignore_ime_char = 1;
+          /* Ignore the messages for the rest of the
+	     characters in the string that was output above.  */
+          ignore_ime_char = (size / sizeof (wchar_t)) - 1;
         }
+      else
+	ignore_ime_char--;
+
       break;
 
     case WM_IME_ENDCOMPOSITION: